+Sun Jul 2 18:19:50 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkwidget.[ch] (gtk_widget_create_pango_layout): Add a 'text' argument to
+ set the initial text.
+
+ * gtk/gtkaccellabel.c gtk/gtkcalendar.c gtk/gtkclist.c
+ gtk/gtkentry.c gtk/gtkhruler.c gtk/gtkhscale.c gtk/gtklabel.c
+ gtk/gtkprogressbar.c gtk/gtkscale.c gtk/gtkvruler.c
+ gtk/gtkvscale.c: Adapt to new argument of create_pango_layout().
+
+ * gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
+ pango_layout_set_font_description to simplify.
+
Sun Jul 2 17:43:41 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
+Sun Jul 2 18:19:50 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkwidget.[ch] (gtk_widget_create_pango_layout): Add a 'text' argument to
+ set the initial text.
+
+ * gtk/gtkaccellabel.c gtk/gtkcalendar.c gtk/gtkclist.c
+ gtk/gtkentry.c gtk/gtkhruler.c gtk/gtkhscale.c gtk/gtklabel.c
+ gtk/gtkprogressbar.c gtk/gtkscale.c gtk/gtkvruler.c
+ gtk/gtkvscale.c: Adapt to new argument of create_pango_layout().
+
+ * gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
+ pango_layout_set_font_description to simplify.
+
Sun Jul 2 17:43:41 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
+Sun Jul 2 18:19:50 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkwidget.[ch] (gtk_widget_create_pango_layout): Add a 'text' argument to
+ set the initial text.
+
+ * gtk/gtkaccellabel.c gtk/gtkcalendar.c gtk/gtkclist.c
+ gtk/gtkentry.c gtk/gtkhruler.c gtk/gtkhscale.c gtk/gtklabel.c
+ gtk/gtkprogressbar.c gtk/gtkscale.c gtk/gtkvruler.c
+ gtk/gtkvscale.c: Adapt to new argument of create_pango_layout().
+
+ * gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
+ pango_layout_set_font_description to simplify.
+
Sun Jul 2 17:43:41 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
+Sun Jul 2 18:19:50 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkwidget.[ch] (gtk_widget_create_pango_layout): Add a 'text' argument to
+ set the initial text.
+
+ * gtk/gtkaccellabel.c gtk/gtkcalendar.c gtk/gtkclist.c
+ gtk/gtkentry.c gtk/gtkhruler.c gtk/gtkhscale.c gtk/gtklabel.c
+ gtk/gtkprogressbar.c gtk/gtkscale.c gtk/gtkvruler.c
+ gtk/gtkvscale.c: Adapt to new argument of create_pango_layout().
+
+ * gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
+ pango_layout_set_font_description to simplify.
+
Sun Jul 2 17:43:41 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
+Sun Jul 2 18:19:50 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkwidget.[ch] (gtk_widget_create_pango_layout): Add a 'text' argument to
+ set the initial text.
+
+ * gtk/gtkaccellabel.c gtk/gtkcalendar.c gtk/gtkclist.c
+ gtk/gtkentry.c gtk/gtkhruler.c gtk/gtkhscale.c gtk/gtklabel.c
+ gtk/gtkprogressbar.c gtk/gtkscale.c gtk/gtkvruler.c
+ gtk/gtkvscale.c: Adapt to new argument of create_pango_layout().
+
+ * gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
+ pango_layout_set_font_description to simplify.
+
Sun Jul 2 17:43:41 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
+Sun Jul 2 18:19:50 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkwidget.[ch] (gtk_widget_create_pango_layout): Add a 'text' argument to
+ set the initial text.
+
+ * gtk/gtkaccellabel.c gtk/gtkcalendar.c gtk/gtkclist.c
+ gtk/gtkentry.c gtk/gtkhruler.c gtk/gtkhscale.c gtk/gtklabel.c
+ gtk/gtkprogressbar.c gtk/gtkscale.c gtk/gtkvruler.c
+ gtk/gtkvscale.c: Adapt to new argument of create_pango_layout().
+
+ * gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
+ pango_layout_set_font_description to simplify.
+
Sun Jul 2 17:43:41 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
+Sun Jul 2 18:19:50 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkwidget.[ch] (gtk_widget_create_pango_layout): Add a 'text' argument to
+ set the initial text.
+
+ * gtk/gtkaccellabel.c gtk/gtkcalendar.c gtk/gtkclist.c
+ gtk/gtkentry.c gtk/gtkhruler.c gtk/gtkhscale.c gtk/gtklabel.c
+ gtk/gtkprogressbar.c gtk/gtkscale.c gtk/gtkvruler.c
+ gtk/gtkvscale.c: Adapt to new argument of create_pango_layout().
+
+ * gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
+ pango_layout_set_font_description to simplify.
+
Sun Jul 2 17:43:41 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
if (GTK_WIDGET_CLASS (parent_class)->size_request)
GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition);
- layout = gtk_widget_create_pango_layout (widget);
- pango_layout_set_text (layout, accel_label->accel_string, -1);
+ layout = gtk_widget_create_pango_layout (widget, accel_label->accel_string);
pango_layout_get_pixel_size (layout, &width, NULL);
accel_label->accel_string_width = width;
(widget->requisition.height - misc->ypad * 2)) *
misc->yalign) + 1.5;
- layout = gtk_widget_create_pango_layout (widget);
- pango_layout_set_text (layout, accel_label->accel_string, -1);
+ layout = gtk_widget_create_pango_layout (widget, accel_label->accel_string);
if (GTK_WIDGET_STATE (accel_label) == GTK_STATE_INSENSITIVE)
gdk_draw_layout (widget->window,
calendar = GTK_CALENDAR (widget);
private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
- layout = gtk_widget_create_pango_layout (widget);
+ layout = gtk_widget_create_pango_layout (widget, NULL);
/*
* Calculate the requisition width for the widget.
0, 0, header_width, private_data->header_h);
- layout = gtk_widget_create_pango_layout (widget);
-
sprintf (buffer, "%d", calendar->year);
- pango_layout_set_text (layout, buffer, -1);
+ layout = gtk_widget_create_pango_layout (widget, buffer);
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
/* Draw title */
* Write the labels
*/
- layout = gtk_widget_create_pango_layout (widget);
+ layout = gtk_widget_create_pango_layout (widget, NULL);
gdk_gc_set_foreground (gc, &widget->style->fg[GTK_STATE_SELECTED]);
for (i = 0; i < 7; i++)
* Write the labels
*/
- layout = gtk_widget_create_pango_layout (widget);
+ layout = gtk_widget_create_pango_layout (widget, NULL);
gdk_gc_set_foreground (gc, &widget->style->fg[GTK_STATE_SELECTED]);
day_height = row_height (calendar);
}
- layout = gtk_widget_create_pango_layout (widget);
-
sprintf (buffer, "%d", day);
- pango_layout_set_text (layout, buffer, -1);
+ layout = gtk_widget_create_pango_layout (widget, buffer);
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
x_loc -= logical_rect.width;
GtkCListRow *clist_row,
gint column)
{
- PangoContext *context;
PangoLayout *layout;
GtkStyle *style;
GtkCell *cell;
if (!text)
return NULL;
- layout = gtk_widget_create_pango_layout (GTK_WIDGET (clist));
+ layout = gtk_widget_create_pango_layout (GTK_WIDGET (clist),
+ ((cell->type == GTK_CELL_PIXTEXT) ?
+ GTK_CELL_PIXTEXT (*cell)->text :
+ GTK_CELL_TEXT (*cell)->text));
pango_layout_set_font_description (layout, style->font_desc);
- pango_layout_set_text (layout, ((cell->type == GTK_CELL_PIXTEXT) ?
- GTK_CELL_PIXTEXT (*cell)->text :
- GTK_CELL_TEXT (*cell)->text), -1);
return layout;
if (!entry->layout)
{
- entry->layout = gtk_widget_create_pango_layout (widget);
+ entry->layout = gtk_widget_create_pango_layout (widget, NULL);
pango_layout_set_text (entry->layout, entry->text, entry->n_bytes);
}
}
digit_height = PANGO_PIXELS (ink_rect.height) + 2;
digit_offset = ink_rect.y;
- layout = gtk_widget_create_pango_layout (widget);
- pango_layout_set_text (layout, "012456789", -1);
+ layout = gtk_widget_create_pango_layout (widget, "012456789");
pango_layout_get_extents (layout, &ink_rect, &logical_rect);
digit_height = PANGO_PIXELS (ink_rect.height) + 1;
PangoRectangle logical_rect;
sprintf (buffer, "%0.*f", GTK_RANGE (scale)->digits, GTK_RANGE (scale)->adjustment->value);
-
- layout = gtk_widget_create_pango_layout (widget);
- pango_layout_set_text (layout, buffer, -1);
+ layout = gtk_widget_create_pango_layout (widget, buffer);
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
switch (scale->value_pos)
PangoAlignment align = PANGO_ALIGN_LEFT; /* Quiet gcc */
PangoAttrList *attrs = gtk_label_pattern_to_attrs (label);
- label->layout = gtk_widget_create_pango_layout (widget);
+ label->layout = gtk_widget_create_pango_layout (widget, label->label);
+
pango_layout_set_attributes (label->layout, attrs);
pango_attr_list_unref (attrs);
- pango_layout_set_text (label->layout, label->label, -1);
-
switch (label->jtype)
{
case GTK_JUSTIFY_LEFT:
{
buf = gtk_progress_get_text_from_value (progress, progress->adjustment->upper);
- layout = gtk_widget_create_pango_layout (widget);
- pango_layout_set_text (layout, buf, -1);
+ layout = gtk_widget_create_pango_layout (widget, buf);
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
g_object_unref (G_OBJECT (layout));
buf = gtk_progress_get_current_text (progress);
- layout = gtk_widget_create_pango_layout (widget);
- pango_layout_set_text (layout, buf, -1);
+ layout = gtk_widget_create_pango_layout (widget, buf);
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
x = widget->style->xthickness + 1 +
range = GTK_RANGE (scale);
- layout = gtk_widget_create_pango_layout (GTK_WIDGET (scale));
+ layout = gtk_widget_create_pango_layout (GTK_WIDGET (scale), NULL);
value = ABS (range->adjustment->lower);
if (value == 0) value = 1;
xthickness = widget->style->xthickness;
ythickness = widget->style->ythickness;
- layout = gtk_widget_create_pango_layout (widget);
- pango_layout_set_text (layout, "012456789", -1);
+ layout = gtk_widget_create_pango_layout (widget, "012456789");
pango_layout_get_extents (layout, &ink_rect, &logical_rect);
digit_height = PANGO_PIXELS (ink_rect.height) + 2;
sprintf (buffer, "%0.*f", GTK_RANGE (scale)->digits, GTK_RANGE (scale)->adjustment->value);
- layout = gtk_widget_create_pango_layout (widget);
- pango_layout_set_text (layout, buffer, strlen (buffer));
+ layout = gtk_widget_create_pango_layout (widget, buffer);
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
switch (scale->value_pos)
/**
* gtk_widget_create_pango_layout:
* @widget: a #PangoWidget
+ * @text: text to set on the layout (can be %NULL)
*
* Create a new #PangoLayout with the appropriate colormap,
* font description, and base direction for drawing text for
* Return value: the new #PangoLayout
**/
PangoLayout *
-gtk_widget_create_pango_layout (GtkWidget *widget)
+gtk_widget_create_pango_layout (GtkWidget *widget,
+ const gchar *text)
{
PangoLayout *layout;
PangoContext *context;
context = gtk_widget_get_pango_context (widget);
layout = pango_layout_new (context);
+ if (text)
+ pango_layout_set_text (layout, text, -1);
+
return layout;
}
void gtk_widget_modify_style (GtkWidget *widget,
GtkRcStyle *style);
-PangoContext *gtk_widget_create_pango_context (GtkWidget *widget);
-PangoContext *gtk_widget_get_pango_context (GtkWidget *widget);
-PangoLayout *gtk_widget_create_pango_layout (GtkWidget *widget);
+PangoContext *gtk_widget_create_pango_context (GtkWidget *widget);
+PangoContext *gtk_widget_get_pango_context (GtkWidget *widget);
+PangoLayout *gtk_widget_create_pango_layout (GtkWidget *widget,
+ const gchar *text);
/* handle composite names for GTK_COMPOSITE_CHILD widgets,
* the returned name is newly allocated.